bitkeeper revision 1.1500 (428f08f1cclAJMtKpbiDrXknPvaMCA)

Small ioemu build fixes. Fix 'make clean' so we can switch between
32-bit and 64-bit build easily.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/Makefile b/tools/Makefile
index 64778a91469ac3a166f7065ee39b3ef664f5917b..52ddb9f24be3143f1b3a1a8afc97287ec7908868 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -38,10 +38,6 @@ check:
 check_clean:
        $(MAKE) -C check clean
 
-ifneq ($(XEN_TARGET_ARCH),x86_32)
-XEN_NO_IOEMU=1
-endif
-
 ifndef XEN_NO_IOEMU
 ioemu ioemuinstall ioemuclean:
        [ -f ioemu/config-host.h ] || \

diff --git a/tools/ioemu/Makefile b/tools/ioemu/Makefile
index 391193e73b67e5bde390ec0124be8b0ca744c085..9b3157c4c9e294683421eb9b5279e2a37eb117fa 100644 (file)
--- a/tools/ioemu/Makefile
+++ b/tools/ioemu/Makefile
@@ -35,6 +35,8 @@ clean:
        for d in $(TARGET_DIRS); do \
        $(MAKE) -C $$d $@ || exit 1 ; \
         done
+       rm -f config-host.mak config-host.h
+       rm -f keysym_adapter_sdl.h keysym_adapter_vnc.h
 
 distclean: clean
        rm -f config-host.mak config-host.h